From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 1 Jan 2007 01:57:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~3063
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=09d52eaa5f7de1bd9e83fb3981c3268319c4327a;p=emacs.git

*** empty log message ***
---

diff --git a/man/ChangeLog b/man/ChangeLog
index 3e6fb6d8164..1404658209e 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,6 +1,15 @@
+2007-01-01  Richard Stallman  <rms@gnu.org>
+
+	* commands.texi (User Input): Document keys stolen by window mangers.
+
+2006-12-31  Richard Stallman  <rms@gnu.org>
+
+	* custom.texi (Specific Customization): Document customize-option
+	instead of customize-variable.
+
 2006-12-31  Kim F. Storm  <storm@cua.dk>
 
-	* major.texi (Choosing Modes): Document auto-mode-case-fond.
+	* major.texi (Choosing Modes): Document auto-mode-case-fold.
 
 2006-12-30  Kim F. Storm  <storm@cua.dk>
 
@@ -44,6 +53,7 @@
 	(IMAP): Document nnimap-search-uids-not-since-is-evil and
 	nnimap-nov-is-evil.
 
+>>>>>>> 1.1170
 2006-12-27  Eli Zaretskii  <eliz@gnu.org>
 
 	* msdog.texi (Windows Keyboard): Mention widespread Windows bindings,